Home Explore Help
Register Sign In
Kodo
/
kodo
Watch 2
Star 0
Fork 0

Browse Source
New fields

Brightcells 6 years ago
parent
aff7eade1e
commit
8f7ce0fd0e
3 changed files with 17 additions and 7 deletions
Show Diff Stats
  1. 4 4
      integral/admin.py
  2. 8 2
      integral/models.py
  3. 5 1
      page/sale_views.py

+ 4 - 4
integral/admin.py
View File 

@@ -1,7 +1,7 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 3 
 from django.contrib import admin
4 
-from django_admin import ReadOnlyModelAdmin
4 
+from django_admin import ReadOnlyModelAdmin, AdvancedExportExcelModelAdmin
5 5
6 6 
 from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo
7 7 
 
@@ -13,9 +13,9 @@ class SaleclerkIntegralIncomeExpensesInfoAdmin(ReadOnlyModelAdmin, admin.ModelAd
13 13 
     search_fields = ('code', 'remark')
14 14
15 15
16 
-class SaleclerkSubmitLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):
17 
-    list_display = ('clerk_id', 'code', 'remark', 'dupload', 'test_user', 'test_sn', 'status', 'created_at', 'updated_at')
18 
-    list_filter = ('dupload', 'test_user', 'test_sn', 'status')
16 
+class SaleclerkSubmitLogInfoAdmin(AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin, admin.ModelAdmin):
17 
+    list_display = ('brand_pk', 'brand_name', 'model_pk', 'model_name', 'distributor_pk', 'distributor_name', 'clerk_id', 'clerk_name', 'code', 'remark', 'dupload', 'test_user', 'test_sn', 'status', 'created_at', 'updated_at')
18 
+    list_filter = ('brand_pk', 'dupload', 'test_user', 'test_sn', 'status')
19 19 
     search_fields = ('code', 'remark')
20 20
21 21

+ 8 - 2
integral/models.py
View File 

@@ -76,11 +76,17 @@ class SaleclerkIntegralIncomeExpensesInfo(BaseModelMixin):
76 76
77 77
78 78 
 class SaleclerkSubmitLogInfo(BaseModelMixin):
79 
-    clerk_id = models.CharField(_(u'clerk_id'), max_length=32, blank=True, null=True, help_text=u'店员唯一标识', db_index=True)
80 
-
81 79 
     brand_pk = models.IntegerField(_(u'brand_pk'), default=0, help_text=u'品牌PK', db_index=True)
80 
+    brand_name = models.CharField(_(u'brand_name'), max_length=255, blank=True, null=True, help_text=u'品牌名称')
81 
+
82 82 
     model_pk = models.IntegerField(_(u'model_pk'), default=0, help_text=u'型号PK', db_index=True)
83 
+    model_name = models.CharField(_(u'model_name'), max_length=255, blank=True, null=True, help_text=u'型号名称')
84 
+
83 85 
     distributor_pk = models.IntegerField(_(u'distributor_pk'), default=0, help_text=u'经销商PK', db_index=True)
86 
+    distributor_name = models.CharField(_(u'distributor_name'), max_length=32, blank=True, null=True, help_text=u'经销商名称')
87 
+
88 
+    clerk_id = models.CharField(_(u'clerk_id'), max_length=32, blank=True, null=True, help_text=u'店员唯一标识', db_index=True)
89 
+    clerk_name = models.CharField(_(u'clerk_name'), max_length=32, blank=True, null=True, help_text=u'店员名称')
84 90
85 91 
     code = models.CharField(_(u'code'), max_length=32, blank=True, null=True, help_text=u'机身码', db_index=True)
86 92

+ 5 - 1
page/sale_views.py
View File 

@@ -86,10 +86,14 @@ def clerk_sale_submit_api(request):
86 86
87 87 
     # 店员提交记录
88 88 
     ssli = SaleclerkSubmitLogInfo.objects.create(
89 
-        clerk_id=clerk.clerk_id,
90 89 
         brand_pk=brand.pk,
90 
+        brand_name=brand.brand_name,
91 91 
         model_pk=modelID,
92 
+        model_name=model.model_name,
92 93 
         distributor_pk=distributorID,
94 
+        distributor_name=distributor.distributor_name,
95 
+        clerk_id=clerk.clerk_id,
96 
+        clerk_name=clerk.clerk_name,
93 97 
         code=serialNo,
94 98 
         consumer_name=consumer_name,
95 99 
         consumer_phone=consumer_phone,